<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <div>kaixin</div>
    <div>pull第二种方法</div>
    <div>再一次测试</div>
    <div>push冲突测试</div>
    <div>我也再次进行冲突测试</div>
    <div>冲突再次测试</div>
    <div>摘草莓一版本</div>
    <div>摘草莓二版本</div>
    <div>摘草莓三版本</div>
</body>
</html>